Return boolean (and FALSE from focus_in / focus_out handlers. (#69528,

Tue Jan 29 14:56:28 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtksocket.c (toplevel_focus_out_handler): Return boolean
        (and FALSE from focus_in / focus_out handlers. (#69528,
        Padraig O'Briain)

diff --git a/ChangeLog b/ChangeLog
index a8bcdc2c0aafbb63d0fded68b70bd5bc62be88f2..f7634d33e52f7477e4d50e682286ee65d5de6cfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+Tue Jan 29 14:56:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (toplevel_focus_out_handler): Return boolean
+       (and FALSE from focus_in / focus_out handlers. (#69528,
+       Padraig O'Briain)
+
 Tue Jan 29 14:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Remove the scary startup
-       warning.
+       warning. (#69480)
 
 Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a8bcdc2c0aafbb63d0fded68b70bd5bc62be88f2..f7634d33e52f7477e4d50e682286ee65d5de6cfa 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,7 +1,13 @@
+Tue Jan 29 14:56:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (toplevel_focus_out_handler): Return boolean
+       (and FALSE from focus_in / focus_out handlers. (#69528,
+       Padraig O'Briain)
+
 Tue Jan 29 14:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Remove the scary startup
-       warning.
+       warning. (#69480)
 
 Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a8bcdc2c0aafbb63d0fded68b70bd5bc62be88f2..f7634d33e52f7477e4d50e682286ee65d5de6cfa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,13 @@
+Tue Jan 29 14:56:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (toplevel_focus_out_handler): Return boolean
+       (and FALSE from focus_in / focus_out handlers. (#69528,
+       Padraig O'Briain)
+
 Tue Jan 29 14:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Remove the scary startup
-       warning.
+       warning. (#69480)
 
 Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a8bcdc2c0aafbb63d0fded68b70bd5bc62be88f2..f7634d33e52f7477e4d50e682286ee65d5de6cfa 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,7 +1,13 @@
+Tue Jan 29 14:56:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (toplevel_focus_out_handler): Return boolean
+       (and FALSE from focus_in / focus_out handlers. (#69528,
+       Padraig O'Briain)
+
 Tue Jan 29 14:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Remove the scary startup
-       warning.
+       warning. (#69480)
 
 Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a8bcdc2c0aafbb63d0fded68b70bd5bc62be88f2..f7634d33e52f7477e4d50e682286ee65d5de6cfa 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,7 +1,13 @@
+Tue Jan 29 14:56:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (toplevel_focus_out_handler): Return boolean
+       (and FALSE from focus_in / focus_out handlers. (#69528,
+       Padraig O'Briain)
+
 Tue Jan 29 14:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Remove the scary startup
-       warning.
+       warning. (#69480)
 
 Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a8bcdc2c0aafbb63d0fded68b70bd5bc62be88f2..f7634d33e52f7477e4d50e682286ee65d5de6cfa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,13 @@
+Tue Jan 29 14:56:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (toplevel_focus_out_handler): Return boolean
+       (and FALSE from focus_in / focus_out handlers. (#69528,
+       Padraig O'Briain)
+
 Tue Jan 29 14:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Remove the scary startup
-       warning.
+       warning. (#69480)
 
 Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a8bcdc2c0aafbb63d0fded68b70bd5bc62be88f2..f7634d33e52f7477e4d50e682286ee65d5de6cfa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,13 @@
+Tue Jan 29 14:56:28 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksocket.c (toplevel_focus_out_handler): Return boolean
+       (and FALSE from focus_in / focus_out handlers. (#69528,
+       Padraig O'Briain)
+
 Tue Jan 29 14:47:54 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Remove the scary startup
-       warning.
+       warning. (#69480)
 
 Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
 

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 8c2deb198c9c2a692669dd58852a7dc20fa21c32..543cb15442d6bbc63394c37b314c5a27b179dd84 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -612,7 +612,7 @@ toplevel_key_press_handler (GtkWidget   *toplevel,
 
 #endif
 
-static void
+static gboolean
 toplevel_focus_in_handler (GtkWidget     *toplevel,
                           GdkEventFocus *event,
                           GtkSocket     *socket)
@@ -625,15 +625,19 @@ toplevel_focus_in_handler (GtkWidget     *toplevel,
   if (GTK_WIDGET_VISIBLE (toplevel))
     send_xembed_message (socket, XEMBED_WINDOW_ACTIVATE, 0, 0, 0,
                         gtk_get_current_event_time ()); /* Will be GDK_CURRENT_TIME */
+
+  return FALSE;
 }
 
-static void
+static gboolean
 toplevel_focus_out_handler (GtkWidget     *toplevel,
                            GdkEventFocus *event,
                            GtkSocket     *socket)
 {
   send_xembed_message (socket, XEMBED_WINDOW_DEACTIVATE, 0, 0, 0,
                       gtk_get_current_event_time ()); /* Will be GDK_CURRENT_TIME */
+
+  return FALSE;
 }
 
 static void